bitkeeper revision 1.1236.1.37 (42220839uiUo4mhX0fedaXFvOocS4Q)

Update error message when loading a "not Xen v3.0" image.
Signed-off-by: chris@xensource.com

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 9b3a330841f0fad1be71ac38ac787718f87fb49e..d53dd4819f4d041ce41729180cd1030111658c24 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -15,6 +15,7 @@ br260@laudney.cl.cam.ac.uk
 bren@anvil.research
 bren@br260.wolfson.cam.ac.uk
 cl349@arcadians.cl.cam.ac.uk
+cl349@firebug.cl.cam.ac.uk
 cl349@freefall.cl.cam.ac.uk
 cl349@labyrinth.cl.cam.ac.uk
 cwc22@centipede.cl.cam.ac.uk

diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c
index 8f7a979d756334b8f9e803535ace43eee8db00e8..6eab54c98ee67e2ac2f2e387a56f7c31464754e7 100644 (file)
--- a/tools/libxc/xc_linux_build.c
+++ b/tools/libxc/xc_linux_build.c
@@ -540,7 +540,7 @@ static int parseelfimage(char *elfbase,
 
         if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) )
         {
-            ERROR("Will only load images built for Xen v2.0");
+            ERROR("Will only load images built for Xen v3.0");
             ERROR("Actually saw: '%s'", guestinfo);
             return -EINVAL;
         }

diff --git a/xen/common/elf.c b/xen/common/elf.c
index 38cbb30db0b11ea50b2e487ebc94de168725a421..3beb7b54c9ef922cb87fd887c3bc5bceb39c7faa 100644 (file)
--- a/xen/common/elf.c
+++ b/xen/common/elf.c
@@ -78,7 +78,7 @@ int parseelfimage(char *elfbase,
 
         if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) )
         {
-            printk("ERROR: Xen will only load images built for Xen v2.0\n");
+            printk("ERROR: Xen will only load images built for Xen v3.0\n");
             return -EINVAL;
         }